From: Florian Müllner <fmuellner@gnome.org>
Date: Sat, 11 Aug 2012 00:33:20 +0000 (+0200)
Subject: main: Do not hard-code <super> as overlay-key
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~6194
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=028e83181beba9e227254a11117cde4c13496bbf;p=gnome-shell.git

main: Do not hard-code <super> as overlay-key

Use the new OVERLAY_KEY keybinding action instead of special-casing
the overlay-key to make sure the same key will be used in- and outside
the overview.

https://bugzilla.gnome.org/show_bug.cgi?id=665547
---

diff --git a/js/ui/main.js b/js/ui/main.js
index 766d8653d..adfaae2e4 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -588,12 +588,6 @@ function _globalKeyPressHandler(actor, event) {
     // This relies on the fact that Clutter.ModifierType is the same as Gdk.ModifierType
     let action = global.display.get_keybinding_action(keyCode, modifierState);
 
-    // This isn't a Meta.KeyBindingAction yet
-    if (symbol == Clutter.Super_L || symbol == Clutter.Super_R) {
-        overview.hide();
-        return true;
-    }
-
     if (action == Meta.KeyBindingAction.SWITCH_PANELS) {
         ctrlAltTabManager.popup(modifierState & Clutter.ModifierType.SHIFT_MASK,
                                 modifierState);
@@ -636,6 +630,7 @@ function _globalKeyPressHandler(actor, event) {
             getRunDialog().open();
             return true;
         case Meta.KeyBindingAction.PANEL_MAIN_MENU:
+        case Meta.KeyBindingAction.OVERLAY_KEY:
             overview.hide();
             return true;
     }